dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a3ab6f3
)
*oi_metadata can't be null. Some fa_metadata values are NULL since there was not...
author
Aaron Schulz
<aaron@users.mediawiki.org>
Sat, 25 Aug 2007 19:22:51 +0000
(19:22 +0000)
committer
Aaron Schulz
<aaron@users.mediawiki.org>
Sat, 25 Aug 2007 19:22:51 +0000
(19:22 +0000)
includes/filerepo/LocalFile.php
patch
|
blob
|
history
diff --git
a/includes/filerepo/LocalFile.php
b/includes/filerepo/LocalFile.php
index
cff948d
..
6edc034
100644
(file)
--- a/
includes/filerepo/LocalFile.php
+++ b/
includes/filerepo/LocalFile.php
@@
-1474,7
+1474,7
@@
class LocalFileRestoreBatch {
'oi_user' => $row->fa_user,
'oi_user_text' => $row->fa_user_text,
'oi_timestamp' => $row->fa_timestamp,
- 'oi_metadata' => $row->fa_metadata,
+ 'oi_metadata' =>
is_null($row->fa_metadata) ? '' :
$row->fa_metadata,
'oi_media_type' => $row->fa_media_type,
'oi_major_mime' => $row->fa_major_mime,
'oi_minor_mime' => $row->fa_minor_mime,